Fix integer overflow for the values passed to the pixel functions.

Fri Jan 11 18:05:07 2002  Owen Taylor  <otaylor@redhat.com>

	* pixops/pixops.c: Fix integer overflow for the values
	passed to the pixel functions. (#55148)

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index ddaa701404004f1ce91122898067792237bf9a35..4a9d2a0ae2466c7db5d1ded1504a5912fed46206 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 11 18:05:07 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * pixops/pixops.c: Fix integer overflow for the values
+       passed to the pixel functions. (#55148)
+
 Fri Jan 11 17:53:58 2002  Owen Taylor  <otaylor@redhat.com>
 
        * pixops/pixops.c (pixops_scale_nearest): Remove meaningless

diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
index a2fcbb08e8532111f06c6b8abb0688abbec320af..201c17c0e60d20bcf19d25e67eaf9298c7c8a86b 100644 (file)
--- a/gdk-pixbuf/pixops/pixops.c
+++ b/gdk-pixbuf/pixops/pixops.c
@@ -30,7 +30,7 @@ typedef guchar *(*PixopsLineFunc) (int *weights, int n_x, int n_y,
 typedef void (*PixopsPixelFunc) (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha,
                                 int src_has_alpha, int check_size, guint32 color1,
                                 guint32 color2,
-                                int r, int g, int b, int a);
+                                guint r, guint g, guint b, guint a);
 
 static int
 get_check_shift (int check_size)
@@ -343,7 +343,7 @@ pixops_composite_color_nearest (guchar        *dest_buf,
 static void
 composite_pixel (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha,
                 int src_has_alpha, int check_size, guint32 color1, guint32 color2,
-                int r, int g, int b, int a)
+                guint r, guint g, guint b, guint a)
 {
   if (dest_has_alpha)
     {
@@ -547,7 +547,7 @@ composite_line_22_4a4_mmx_stub (int *weights, int n_x, int n_y,
 static void
 composite_pixel_color (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha,
                       int src_has_alpha, int check_size, guint32 color1, guint32 color2,
-                      int r, int g, int b, int a)
+                      guint r, guint g, guint b, guint a)
 {
   int dest_r, dest_g, dest_b;
   int check_shift = get_check_shift (check_size);
@@ -693,7 +693,7 @@ composite_line_color_22_4a4_mmx_stub (int *weights, int n_x, int n_y,
 static void
 scale_pixel (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha,
             int src_has_alpha, int check_size, guint32 color1, guint32 color2,
-            int r, int g, int b, int a)
+            guint r, guint g, guint b, guint a)
 {
   if (src_has_alpha)
     {